Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustfmt librustc_trans/save #28161

Merged
merged 2 commits into from
Sep 5, 2015
Merged

rustfmt librustc_trans/save #28161

merged 2 commits into from
Sep 5, 2015

Conversation

nrc
Copy link
Member

@nrc nrc commented Sep 2, 2015

No description provided.

@rust-highfive
Copy link
Collaborator

r? @Aatch

(rust_highfive has picked a reviewer for you, use r? to override)

@nrc
Copy link
Member Author

nrc commented Sep 2, 2015

Addressed bounds issue

@bors
Copy link
Contributor

bors commented Sep 3, 2015

☔ The latest upstream changes (presumably #28174) made this pull request unmergeable. Please resolve the merge conflicts.

@nrc
Copy link
Member Author

nrc commented Sep 4, 2015

r? @brson

@rust-highfive rust-highfive assigned brson and unassigned Aatch Sep 4, 2015
@brson
Copy link
Contributor

brson commented Sep 4, 2015

Damn good formatting, right here!

r=me

@jroesch
Copy link
Member

jroesch commented Sep 4, 2015

Super excited about being able to run rustfmt on the compiler! 👍 👍

@nrc
Copy link
Member Author

nrc commented Sep 4, 2015

@bors: r=brson

@bors
Copy link
Contributor

bors commented Sep 4, 2015

📌 Commit 6a127e9 has been approved by brson

@bors
Copy link
Contributor

bors commented Sep 4, 2015

⌛ Testing commit 6a127e9 with merge b508991...

@alexcrichton
Copy link
Member

@bors: retry force

bors added a commit that referenced this pull request Sep 4, 2015
@bors
Copy link
Contributor

bors commented Sep 4, 2015

⌛ Testing commit 6a127e9 with merge 779b2a9...

@@ -653,8 +647,8 @@ impl <'l, 'tcx> DumpCsvVisitor<'l, 'tcx> {
}
}

fn process_mod(&mut self,
item: &ast::Item) { // The module in question, represented as an item.
// `item` is the module in question, represented as an item.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nrc did you notice that it moved the comment from inside to outside of the function? Is this intentional?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was actually a manual fixup, so intentional. The comment is on the arg, so it doesn't matter if it is inside or outside the function.

(This is actually due to an interesting bug in rustfmt - we check to see if everything will fit on one line, then deal with 'inner' comments, in this case by appending them, which causes the line to overflow. It's tricky because the only indicator that the comment will start on the same line is the absence of a newline which isn't in anything's span. So I had to patch around the bug for now...).

@bors bors merged commit 6a127e9 into rust-lang:master Sep 5, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants